Fix for azure change to support table datatypes