Build with Java 1.6 compatibility