Add Optional Token ID

Not connected.