Updated models to match GIS requirement