first commit after moving to Entity Framework 5. BIG CHANGE