Updated with Log4j