extend to use also map
change vendor name
update version