Corrected for Java 6
Postgres support