Feature/aggregate keys