More settings, better storage structure