Update of map

#1
Code not tested yet