Encapsulation reworked