encap improvements