Adding more encapsulation