Moved the options handler class into the common space.