Added some extra options