Update getters and Setters