DEVIDM-94: Refactoring of the configuration