Refactor to using faster EmbeddedDocuments instead of seperate collections
Reflecting the change in DataModel