Updated for local usage of psql