tweaks to the document mapper interface
merge