Added some option codes