Added event namespace handlers