Further work to EntityFramework