Use the new external API