Finalize support for PostgreSQL and SQLite