Some changes
Added default config