Added getters and setter