Structure refactoring for the composer