Move somethings to util package