Update data model to handle providers