added define-values/tags