Add and modify util package