Add configs for 5.8