Replaced stubs with PQ prototype