Additional QA Enhancement