Initial setup default values improvement + persist-log option