AddOns functionality added