Adding more informative messages for logging