clean-up
Added support for COUNT