Initial storage implementation