Adds java7 support