Use hash for storage, counter class removed.