Add support for instance count