All the information is now passed in the map

Now I need to make it more robust and general