improving token based security