Include basic features for regular expression support and tested with streaming.  Removed confusion over naming of parameters.