Added messaging framework