Add support for 'archive' and 's3' repos