Add new features, avoid rerunning archive and cleanup on every cron