Refactor key getters