Changed direct variable access to getters