Add expiration date to whoami call