UPDATE: Generalized the config