Changed tokens to use @token@ instead of ${token}