Lay the groundwork for namespace support