Composer like, Autodiscover untested, refactor