renamed storage methods and added backwards support