Data structure for document has been changed to Map instead of Vector