Update composer
Refactor core