Changed to use Composer