Included UserMapID and increased field lengths