Add counter type support