Add custom namespace support