Updates to recent API