Refactor: Redefine Map(T) on top of the more generic VMap(T, U)

The VMap(T, U) can receive the value type as argument, for cases where one
to store scalar values