Refactor Addon class