Work in progress for conversion of ADDIS to SQL