Fix and revert storage functions to yy version