added Token Security support-needs to be refined