ensuring identitymap structure moved to getter and setter