Updated with documents support