Adding maps support