Updating config to be more generic