Plugin rethinked