Updated model to EF