Small improvement to show _type too
Refactored DataDocument code to a separate class, like the DataFeed code