Use Enum suffix for enums, simplify agg_type tp type, single email per notification