Added Javaversion separation