Added getters and Setters