Change to use external API