some internal changes to messaging related classes
beginning work on better policy expression