Audit namespaced & optimized