adding system catalog support