refactor of event handling with support for calls and sms now