Adding new data model

a few updates to the data provider (column name changes and such)