multi module changes for adoption