Added config controlled logging