Stability and performance improvements
