Added an options class.