Updated PG setup