Added support for Redshift