Added support for count