Added adapter to groom the results