Made it composer friendly