Added some additional options