better storage method support