streamline message, add category mappings