More changes to the framework