Added token and signature data spec