+ Added getters and setters