Refactoring & make Composer optionnal.