re-added documents, structures and objects master solution