Make it support Java 1.6