Making the add-on manager more .. not a singleton