Add bundle categorization for safmdgen