Added confirm support