Now works with PostgreSql