fixed build errors after adding entity framework 6 and the new data model classes