Add counter support