Completed the collection aware mapper