Refactored getters and setters