Refactoring of Map classes.