Update source and binary according to new api