Rework for component acrhitecture