Refactoring questions into various document + adding new questions