Add Util method and test