Added intermediate changes for file uploading