Added support for upload of file and images