removal of old template map and use of unordered_map instead