Some changes for file support.