Corrected mapping of collections.