Entity Framework updated as per new db schemas and script