Add tagging of ast