moving storage to persistence api