Add confirm features
Added confirmation features