Moved to java version 7