Add some counting features