Use simpliefied getter function rather than custom query