Continue to refactor Maker.