Added getters/setters and constructors to entities