Encapsulation improvements