add QA support