Upgrade to Good 5.x

Support Good 5.x