Count method improvements