Add support for multiple instances