Teradata-specific improvements