Update to latest API
Fix join