Update Map

Change comments
Change name MAP_SIZE
Update Map within taking into consideration the changes of the
enumeration Element