Added support for payload in EventReceiver (some refactoring is needed though)