Upgrade to Objectify v5