Features for #27 adding in AppSettings