Added more information to logging