Added count to entry points