Improved performance and keepFrame support.