Added some underscore and dash options