Add some method to tools + beginning of UT