Adapting to run on JDK 6
Adapting to run on JDK 6