Additional updates for QA