C++ fix: add resource information structure
Merge branch 'cpp-hashmap' into wip-clusters2