Improvements for extension class.