Refactor product options and option ctrl for the newest API.