Switched to a case insensitive hash table