Started to make necessary changes for file transfer support