CE-1107 Move getters to base class