Major changes and integration of Encap