Added dictionary lookup for counters based on name