Added tokenizers, more parsers and consistency
Removed extractors