Added namespacing support
v2.3.3