toolkit changes for separate configs