IQueryable instead of lists and added IncludeExtension