Fix: Make compatible with Java 6
Use Java 1.6 compliance