Added some more options