Pull counter update into a new class