Refactored option classes.