#74 Added all fields to structure