* adding maps support