Adding more details to logging