Added document store validation