updated to support postgis