Rationalised POM and added logging.