Added package encapsulation