Added quality checks