Moved and renamed setters and getters