CDK-140: Add namespaces

I removed the methods since this is going into 0.17.0.