Started working on the entity class