Tightening up encapsulation