Added some basic options code