Updated storage methods