Added support for avoidable problems