Move more defaults to config