too much for Notifications to handle?

I am using Notifications successfully to instantly notify subscribers of new and edited content. I have CCK fields in one node type and it is sending all the info nicely.

But if I want to notify users of new and edited content of another node type, it sends out the same fields as the first content type. There is no way of defining what fields get sent out per node type. So now it sends out the raw tokens in node-type-2 that doesn't even use those fields.

Is there a way of defining what fields get sent out for EACH subscribed node-type?