Implement proper namespace support