Add @Counted annotation and supporting logic+tests