Added some new options