[YMP] Some work on the Storage