Ajusted var types and names, added log4j dependency