Use entity.primary_address #113