Updated for component