Changing parsing system to a map data

- tests needs to be adapted