Even more changes to the framework