Genericized the configuration a bit.