Added count tool