Updated data connectors to match new data model