Add configuration plus logging