Refactor to use a newer addon version