v1.6:
map added