More work on VMap wrapper
Complete support for Maps and VMaps to retrieve correct Z coordinate