Migrate to v3.0 #3264