Improved map

## v0.1.931
## for ticket [153]
But it is still static. Next commit is expected to be dynamic