Simplify upstream mechanism, remove aggretator, simply detect collision between intermediary keys to trig agregation