Add events namespacing