Refactor cc registration - add order options