add maps support