Support the new mutliple violation changes in the API