Updated config class