app-model updated with corresponding entities