Adding support for count()