update to new Components Architecture