Refactor predefined config handling