Safe haven law expanded