Moved from macro definitions to namespaces