Adapted to use the fork in Composer