Refactoring of defaults config