React to EF changes and fixed sample