Added support for counters