Updated storage contracts