Account for composer more