Added better storage