Fix: Register EventHandlers properly