Updated custom events to not pollute objects