made default config a bit more generic to work OOTB