changed Addon and AddOnManager implementation