Added encapsulation