Proper namespace support