Adding PG and registration flow