Updated tools methods.