Additional work on implementation of document support.