Updated TODO and requirement of archive name