Now with functioning external id