Improvement and fix the alternative plugins