Update composer
Refactoring