added maps support