Add more usful tools