DictModel should suffice. I think I was avoiding it since it's in the test pkg. Perhaps we should move DictModel someplace less seemingly test oriented.