Updates to CodeFramework