maps support and downward compatibility

maps support for 17,
and it also work for R16