Initial version of Oval upgraded to JDK 1.7