Add namespacing support for 0.2.3