Add more missing fields