Config keys refactoring