Addition of quality assurance