Added Java 7 Support