move storage calls to private api