Added util tools