[SJS-214][ENH]: Improved encapsulation system