Updated reinit handling