[PATCH 01/36] Added severity