Document Mapping Bug fix + Add document bug fix