Update default config to be 0.6 ready