Key backwards compatibility updates
Event lookup now uses expressions to define the events instead of strings