Add support for tags for Data Pipeline