Add raw data save mechanism