Removed the need to initialize an options handler and eliminated the unneeded map