Option refactoring