Options refactoring