Update to v3.0 beta changes from today