Updated for Component