Updated to use single special token class.