Improved UT encapsulation.