Added support for postgis