Improve the way we identify logging scenarios