plugin handling changes