Updated to fix issue when  a class mapping is reset after initial configuration.