Updated entity classes

Redefined methods
Updated field and method visibility