Replace Map implementation with Maps V2.