Change parameter from Event to T