Added new models for entities