Add missing fields from user mapping case