Exposing stats in Queries and redesign