Updated classes to use log4j for logging.