Making severity optional - RA-354