Adding java versions 6+7