Moved some getters to the header