7440: more Encapsulation