Bringing in Java-6 Compatibility