Organize variables into folders and add more variables