New Data Structure
Revised services to return disctinct results.