Adding geo location support (PG)