Fixed compile error; split PSQL builder and DSL