Support new suffix uploading thing