Added initial version of map and mvs functions