Added all fields for import