Added upto addons
Added upto addons + optimize