Refactored ComposerUpdateStep