Introduced Option interface and refactored code