Added support for Options command and added built in options data