Support for v1.1 & upload