Add safe paste module option
Minor fix
Minor fix
Minor fix
Minor fix
Fix bce issue (on progress)
Fix bce issue