Updated config system