integrate the first part of the new model for the entities