Refactoring => use constants instead of string for configuration keys