Merging the rest of the util from another repo