Enhanced the configs for each of mode #5008018238609