Changed visibility of class properties to allow class extending