Added counter support