Improving binding key unicity
11 files changed