Updated the generated code and the custom code to match the spec branch