Remove build errors.Form a structure for API call