Changes for Composer structure.