You could use generic events to hold the data, I've toyed with the idea. What you have probably is pretty over complicated for it...