Added support for violations