better namespacing and statistics collection