Refactoring user's counters
Updating TODO