Now requires java 7+