Change event messages

Changed structure to be inline with Symphony core. Added event messages as for 2.4 core