Added support for file upload