Updated Component and Plugin