Added setters and getters