FIX PmProxy + hydrator