Added enclosure tokens.