Finalized Postgres and multiple target support - now to test