Added support for Teradata