refined data model and added to to generate code automatically