Refactored all old config API