Added support for components with validatorIds.