Replace string keys with ClassInfo