Added File upload support and many other bug fixes