20140831:7 - maps integration