remove customer exposure to FpqContext