Better encapsulation v1.0.1