Move storage delegate property handling to dataStorage setter