Improve stability and performance