Add some changes to file utils