Added a flag for enabling PSQL