added more getters and setters