Add Simple Upload logic
More changes on file upload