Add removeCounter support