Adapt to the Components Architecture