Fixed config, adding defaults