Added getters and setters for Entity fields