Update for GA 3.0