Counter Controller refactoring