Working on the class options processing.
Additional class options processing

Added additional processing to class options specified on the command
line.