Latest tool improvements