Added upload parsing