Modified encryption pipeline for changes in data storage struct