Fixed Datastructures so instances are a Document or EmbeddedDocument (#363)