Gmap and Location modules update