Made the to-getters more generic