Partial support for switch to pSQL entirely