Added more struct