Make it composer friendly now