Changed empty result to struct