Updated tagging structure in configure