expanded 'event' into 'message, context' throughout