Kiran | Added entity class and used that whenever an instance of entity definition is created.