Changed add-on loading methodology