Add support for FF and MA storm based warnings