Updated config manager