Updated loading of document