CIDEVSTC-238: Updates for security tokens