Changed Option to OptionValue and added Javadoc