Updated with all percentile types