Modify getter and setter