Add additional settings and organize