Option parsing changes.
Changed Counter class.