Refactoring compontents config