I know, and that wasn't the question. My post was more about the question and the parenthesis at the end: did I miss something smart that Jetbrains has thought out for us, permitting to do the map handling in the common code? (But now, I hope not, because transforming the class into having the map as a backing field turned out to be a quick operation and I don't want to go back now ...) 🙂