Second phase of new config API