Added ability to count queries while in production