Added more getters and Setters