Change to using postgreSQL