Better stubs, namespaces