Added missing util files