Fix DS and event context storage