Added counts

To improve performance