Update getters and setters