Refactor/change to numeric type counter