Refactored namespaces for more general usage