Scratch commit - Mostly working getClassMap changes