More comprehensive logging