Removed redundant GatewayEvent abstraction