Add select support for COUNT