Updated storage engine