Added namespace support