Properly handling event properties