Added store selection when creating counters
Merge branch 'frank' into vopc