Fixed bug where settings were duplicated
The setting's key should be unique
Refactoring