Add Java 6 Support