Added more filenameutils