Better count(*) support