added flag to turn on namespacing