Add CodeTokenId
Support standard HTML