Added storage code