Refactored options