Replaced getters with properties