Performance Enhancements

Add Optimize feature to all collections