Fixed encapsulation issues