Added multiple namespace support