Added crude restart support