Added util and test