Adding maps support.