Added namespace capability to generator