Improved encapsulation
0.2.1