Structure changes for Docs