refactoring for the Composer