Added individual saving and docid