Make change set unique only per bucket