Improve security token