Added support for task identity-links