Added defaults, app specific vs common #36