Better query to model mapping.