Updated Entity Framework for new tables