Use getters instead of direct access