Added checks for severity