Updated composer with replace