Is there a more-robust FiniteMap?