Added category and message_generic