Making severity optional - RA-344