Refactored element counters