Improve namespacing