Fixed Tools to work with new logging framework