Add PG support to master