added namespace support