Update API according to upstream changes, updated dependencies