Enhancements to the framework