Improve use of reference's tools