Refactored Postgis  Data Source