Additional upload support, locations now included.