Refactoring options API