Several Changes for using in Composer