Update for java7