Added PDQ consumer support