Improve event dispatcher + add event namespaces