store maps with class domain now correctly