Merge "Use ClassToInstanceMap instead of a HashMap"