Added Java7 in optional for everyone