Improved encapsulation