Moved some getters and setters