Moved counters operation to models
Cleanup