better namespace support