Add couples of Map & Geo Stuff