Added mef catalog support