Added other missing fields