Add tags property and remove labels property