Addon model changes