Update everything to use the new APIs