Switch to spigot as dep