Add postgres support to CLI3