Added count helper