Added full postgreSQL support