Use other map
Many fixes and cleans