Refactor component config