Added support of MapView V2