Added support for supported_instances arg