Refactor to composite command