Modified List() to return entries