HS & DB2 support