Added a messages framework