Additional QA logic