Add more QA tasks and