fix: Refactored logic for viper and mapstructure workaround

fix: Refactored logic for viper and mapstructure workaround #169