Modified chosen build to use new add-tag features.