Work on entities and model class files