Adding more expression handlers to get data the way Mike seeks it.