Add ClassFunctions and remove test NS
Add EventId