Added shared instance catalog support