@candidasa I'm going to extract this change from here and submit as a separate PR - you should change the token name when you change the contents :-)