Added support for MSSQL and Postgres