Add PG scheme support