added more getters/setters