Added some extra options for parsing