Adding more documents and refactoring some questions