Added encapsulation specific details