change handling of document meta data -- work in progress