adds better support to upload feature