Replace direct access with getters