Improve encapsulation