Added basic getters and setters to entity