Final version of EF-Task solution