More changes to the CodeFramework