improve retrieval and update parsed data
make map more dynamic