Enhance collection add and remove
Corrections for multiple Extension using