Refactoring
Change composer