added support for Maps v2