Improvements to the framework