Initial commit for namespace support