Added raw and signature-container