Refactored option value classes.