2.5.0 Added getters and setters