Updated to v5-beta1