Add extract-iso and update rest