Updated methods and encapsulation
0.4.0