Encapsulation refactor