Made keys immutability configurable