Added more configs before formatting