Updates to support -namespace parameter.