Added getters and setters to entities