More work on AddOns (untested)