Made everything Java 7 compatible