Add postgres support to CLI2