Updated a bit of default config, and DB mapping