Add configuration switching to utils