Addon handling changed