More modifications to the CodeFramework