adding static catalog support