EF DataService enhancements