Added partially tagged tokens functionality