Synchronize with latest API