Add namespace support