Adapted new config style