Switched to const getters