Added archive creation (with a simple workaround)