Updating for v3.0.0-gamma.4