Refactor to clearly delineate generated and custom code in case we need to re-generate due to database changes