Add tag-peeling support