Feature/aggregate threshold