Refactor for Composer