Sync API with master branch