Handled default config better