[MODIF] Use interface Map instead of HashMap class.